From dafe7fd5562b583d6e35293239ec5a89132fa99e Mon Sep 17 00:00:00 2001 From: Alexandr Alexeenko Date: Sun, 16 Jun 2024 21:29:20 +0300 Subject: [PATCH] DeteKt fixes --- .../votekt/data/cache/ProposalWithTransactions.kt | 2 +- .../votekt/data/repository/AppLockRepositoryImpl.kt | 2 +- .../votekt/data/repository/MnemonicRepositoryImpl.kt | 6 +++--- .../data/repository/SendTransactionRepositoryImpl.kt | 6 +++--- .../data/repository/VotingContractRepositoryImpl.kt | 8 ++++---- .../votekt/data/websockets/WebsocketManagerImpl.kt | 2 +- .../votekt/domain/repository/TransactionRepository.kt | 1 - .../votekt/domain/usecase/account/AddAccountUseCase.kt | 2 +- .../domain/usecase/account/CheckAccountCreatedUseCase.kt | 2 +- .../domain/usecase/account/ConfirmNewAccountUseCase.kt | 2 +- .../domain/usecase/account/GenerateAccountUseCase.kt | 2 +- .../domain/usecase/account/GetAccountConfirmationData.kt | 2 +- .../domain/usecase/account/GetSelfAccountUseCase.kt | 2 +- .../domain/usecase/account/ObserveBalanceUseCase.kt | 2 +- .../votekt/domain/usecase/debug/GetTestMnemonicUseCase.kt | 2 +- .../domain/usecase/proposal/DeployDraftProposalUseCase.kt | 2 +- .../transactions/CancelOutgoingTransactionUseCase.kt | 2 +- .../usecase/transactions/ClearTransactionsUseCase.kt | 2 +- .../transactions/ConfirmOutgoingTransactionUseCase.kt | 2 +- .../transactions/ObserveOutgoingTransactionUseCase.kt | 2 +- .../usecase/transactions/ObserveTransactionsUseCase.kt | 2 +- .../ui/components/preview/ProposalListPreviewProvider.kt | 6 +++--- .../ui/components/preview/ProposalPreviewProvider.kt | 6 +++--- .../java/by/alexandr7035/votekt/ui/core/AppViewModel.kt | 4 ++-- .../ui/feature/account/create/ConfirmPhraseViewModel.kt | 2 +- .../ui/feature/account/restore/RestoreAccountViewModel.kt | 2 +- .../ui/feature/applock/lockscreen/LockScreenViewModel.kt | 8 ++++---- .../applock/setup/biometrics/EnableBiometricsViewModel.kt | 4 ++-- .../feature/applock/setup/pincode/CreatePinViewModel.kt | 4 ++-- .../feature/proposals/details/VotingDetailsViewModel.kt | 4 ++-- 30 files changed, 47 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/by/alexandr7035/votekt/data/cache/ProposalWithTransactions.kt b/app/src/main/java/by/alexandr7035/votekt/data/cache/ProposalWithTransactions.kt index 16707ba..3a66a82 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/cache/ProposalWithTransactions.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/cache/ProposalWithTransactions.kt @@ -3,8 +3,8 @@ package by.alexandr7035.votekt.data.cache import androidx.room.Embedded import androidx.room.Relation import by.alexandr7035.votekt.domain.core.BlockchainActionStatus -import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus import by.alexandr7035.votekt.domain.model.proposal.VoteType +import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus data class ProposalWithTransactions( @Embedded val proposal: ProposalEntity, diff --git a/app/src/main/java/by/alexandr7035/votekt/data/repository/AppLockRepositoryImpl.kt b/app/src/main/java/by/alexandr7035/votekt/data/repository/AppLockRepositoryImpl.kt index 2822d19..717bc74 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/repository/AppLockRepositoryImpl.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/repository/AppLockRepositoryImpl.kt @@ -7,11 +7,11 @@ import by.alexandr7035.votekt.data.cache.PrefKeys import by.alexandr7035.votekt.data.security.BiometricsManager import by.alexandr7035.votekt.data.security.CryptoUtils import by.alexandr7035.votekt.data.security.model.BiometricEncryptedPinWrapper -import by.alexandr7035.votekt.domain.repository.AppLockRepository import by.alexandr7035.votekt.domain.model.security.AuthenticationResult import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability import by.alexandr7035.votekt.domain.model.security.EncryptedPinCode import by.alexandr7035.votekt.domain.model.security.PinCode +import by.alexandr7035.votekt.domain.repository.AppLockRepository import com.cioccarellia.ksprefs.KsPrefs import com.squareup.moshi.Moshi import javax.crypto.Cipher diff --git a/app/src/main/java/by/alexandr7035/votekt/data/repository/MnemonicRepositoryImpl.kt b/app/src/main/java/by/alexandr7035/votekt/data/repository/MnemonicRepositoryImpl.kt index b81306c..146c6bf 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/repository/MnemonicRepositoryImpl.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/repository/MnemonicRepositoryImpl.kt @@ -2,11 +2,11 @@ package by.alexandr7035.votekt.data.repository import android.util.Log import by.alexandr7035.votekt.BuildConfig -import by.alexandr7035.votekt.domain.repository.MnemonicRepository -import by.alexandr7035.votekt.domain.model.account.MnemonicWord -import by.alexandr7035.votekt.domain.model.account.MnemonicWordConfirm import by.alexandr7035.votekt.domain.core.AppError import by.alexandr7035.votekt.domain.core.ErrorType +import by.alexandr7035.votekt.domain.model.account.MnemonicWord +import by.alexandr7035.votekt.domain.model.account.MnemonicWordConfirm +import by.alexandr7035.votekt.domain.repository.MnemonicRepository import cash.z.ecc.android.bip39.Mnemonics import java.security.SecureRandom import java.util.Random diff --git a/app/src/main/java/by/alexandr7035/votekt/data/repository/SendTransactionRepositoryImpl.kt b/app/src/main/java/by/alexandr7035/votekt/data/repository/SendTransactionRepositoryImpl.kt index f8a6810..8656dfd 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/repository/SendTransactionRepositoryImpl.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/repository/SendTransactionRepositoryImpl.kt @@ -11,14 +11,14 @@ import by.alexandr7035.ethereum.model.Wei import by.alexandr7035.votekt.BuildConfig import by.alexandr7035.votekt.data.cache.PrefKeys import by.alexandr7035.votekt.data.cache.ProposalsDao -import by.alexandr7035.votekt.domain.repository.AccountRepository import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData import by.alexandr7035.votekt.domain.model.transactions.ReviewTransactionData -import by.alexandr7035.votekt.domain.repository.SendTransactionRepository import by.alexandr7035.votekt.domain.model.transactions.TransactionEstimationError import by.alexandr7035.votekt.domain.model.transactions.TransactionHash -import by.alexandr7035.votekt.domain.repository.TransactionRepository import by.alexandr7035.votekt.domain.model.transactions.TransactionType +import by.alexandr7035.votekt.domain.repository.AccountRepository +import by.alexandr7035.votekt.domain.repository.SendTransactionRepository +import by.alexandr7035.votekt.domain.repository.TransactionRepository import com.cioccarellia.ksprefs.KsPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/by/alexandr7035/votekt/data/repository/VotingContractRepositoryImpl.kt b/app/src/main/java/by/alexandr7035/votekt/data/repository/VotingContractRepositoryImpl.kt index 3ea4c7d..981ea26 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/repository/VotingContractRepositoryImpl.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/repository/VotingContractRepositoryImpl.kt @@ -14,19 +14,19 @@ import by.alexandr7035.votekt.data.cache.ProposalsDao import by.alexandr7035.votekt.data.cache.mapDeployStatus import by.alexandr7035.votekt.data.cache.mapSelfVote import by.alexandr7035.votekt.data.cache.mapVoteStatus -import by.alexandr7035.votekt.domain.repository.AccountRepository import by.alexandr7035.votekt.domain.core.BlockchainActionStatus import by.alexandr7035.votekt.domain.core.OperationResult import by.alexandr7035.votekt.domain.core.Uuid import by.alexandr7035.votekt.domain.model.contract.ContractConfiguration import by.alexandr7035.votekt.domain.model.contract.ContractState import by.alexandr7035.votekt.domain.model.contract.CreateDraftProposal -import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData -import by.alexandr7035.votekt.domain.repository.SendTransactionRepository import by.alexandr7035.votekt.domain.model.proposal.Proposal import by.alexandr7035.votekt.domain.model.proposal.VoteType -import by.alexandr7035.votekt.domain.repository.VotingContractRepository import by.alexandr7035.votekt.domain.model.proposal.VotingData +import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData +import by.alexandr7035.votekt.domain.repository.AccountRepository +import by.alexandr7035.votekt.domain.repository.SendTransactionRepository +import by.alexandr7035.votekt.domain.repository.VotingContractRepository import com.cioccarellia.ksprefs.KsPrefs import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.delay diff --git a/app/src/main/java/by/alexandr7035/votekt/data/websockets/WebsocketManagerImpl.kt b/app/src/main/java/by/alexandr7035/votekt/data/websockets/WebsocketManagerImpl.kt index ba2b7a6..8a13f46 100644 --- a/app/src/main/java/by/alexandr7035/votekt/data/websockets/WebsocketManagerImpl.kt +++ b/app/src/main/java/by/alexandr7035/votekt/data/websockets/WebsocketManagerImpl.kt @@ -4,8 +4,8 @@ import android.util.Log import by.alexandr7035.ethereum.core.EthereumEventListener import by.alexandr7035.ethereum.model.events.EthereumEvent import by.alexandr7035.votekt.domain.core.OperationResult -import by.alexandr7035.votekt.domain.repository.WebsocketManager import by.alexandr7035.votekt.domain.repository.VotingContractRepository +import by.alexandr7035.votekt.domain.repository.WebsocketManager import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/repository/TransactionRepository.kt b/app/src/main/java/by/alexandr7035/votekt/domain/repository/TransactionRepository.kt index 7d1a313..6874334 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/repository/TransactionRepository.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/repository/TransactionRepository.kt @@ -2,7 +2,6 @@ package by.alexandr7035.votekt.domain.repository import by.alexandr7035.ethereum.model.EthTransactionReceipt import by.alexandr7035.ethereum.model.Wei -import by.alexandr7035.votekt.domain.core.OperationResult import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain import by.alexandr7035.votekt.domain.model.transactions.TransactionHash import by.alexandr7035.votekt.domain.model.transactions.TransactionType diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/AddAccountUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/AddAccountUseCase.kt index 1eeced8..bb3f92e 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/AddAccountUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/AddAccountUseCase.kt @@ -1,7 +1,7 @@ package by.alexandr7035.votekt.domain.usecase.account -import by.alexandr7035.votekt.domain.repository.AccountRepository import by.alexandr7035.votekt.domain.model.account.MnemonicWord +import by.alexandr7035.votekt.domain.repository.AccountRepository class AddAccountUseCase( private val accountRepository: AccountRepository diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/CheckAccountCreatedUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/CheckAccountCreatedUseCase.kt index f0fb9df..bf7bd3e 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/CheckAccountCreatedUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/CheckAccountCreatedUseCase.kt @@ -8,4 +8,4 @@ class CheckAccountCreatedUseCase( suspend fun invoke(): Boolean { return accountRepository.isAccountPresent() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ConfirmNewAccountUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ConfirmNewAccountUseCase.kt index acecf51..3b9f3cb 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ConfirmNewAccountUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ConfirmNewAccountUseCase.kt @@ -14,4 +14,4 @@ class ConfirmNewAccountUseCase( ) { return mnemonicRepository.confirmPhrase(mnemonic, proposedWordsToConfirm, confirmationData) } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GenerateAccountUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GenerateAccountUseCase.kt index cd2c5e3..67ec681 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GenerateAccountUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GenerateAccountUseCase.kt @@ -1,7 +1,7 @@ package by.alexandr7035.votekt.domain.usecase.account -import by.alexandr7035.votekt.domain.repository.MnemonicRepository import by.alexandr7035.votekt.domain.model.account.MnemonicWord +import by.alexandr7035.votekt.domain.repository.MnemonicRepository class GenerateAccountUseCase( private val mnemonicRepository: MnemonicRepository diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetAccountConfirmationData.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetAccountConfirmationData.kt index a753ae5..e688af9 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetAccountConfirmationData.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetAccountConfirmationData.kt @@ -10,4 +10,4 @@ class GetAccountConfirmationData( fun invoke(mnemonic: List): List { return mnemonicRepository.getRandomMnemonicWords(mnemonic) } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetSelfAccountUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetSelfAccountUseCase.kt index d93cdd6..1aa3fee 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetSelfAccountUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/GetSelfAccountUseCase.kt @@ -9,4 +9,4 @@ class GetSelfAccountUseCase( suspend fun invoke(): Address { return accountRepository.getSelfAddress() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ObserveBalanceUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ObserveBalanceUseCase.kt index 4e4011d..9826868 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ObserveBalanceUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/account/ObserveBalanceUseCase.kt @@ -10,4 +10,4 @@ class ObserveBalanceUseCase( fun invoke(): Flow { return accountRepository.observeAccountBalance() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/debug/GetTestMnemonicUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/debug/GetTestMnemonicUseCase.kt index e938ed0..2021d42 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/debug/GetTestMnemonicUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/debug/GetTestMnemonicUseCase.kt @@ -1,7 +1,7 @@ package by.alexandr7035.votekt.domain.usecase.debug -import by.alexandr7035.votekt.domain.repository.MnemonicRepository import by.alexandr7035.votekt.domain.model.account.MnemonicWord +import by.alexandr7035.votekt.domain.repository.MnemonicRepository class GetTestMnemonicUseCase( private val mnemonicRepository: MnemonicRepository diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/proposal/DeployDraftProposalUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/proposal/DeployDraftProposalUseCase.kt index ca7eaac..073b8f6 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/proposal/DeployDraftProposalUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/proposal/DeployDraftProposalUseCase.kt @@ -10,4 +10,4 @@ class DeployDraftProposalUseCase( suspend fun invoke(proposalUuid: Uuid): OperationResult { return votingContractRepository.deployDraftProposal(proposalUuid) } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/CancelOutgoingTransactionUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/CancelOutgoingTransactionUseCase.kt index a820cc4..f41b3ef 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/CancelOutgoingTransactionUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/CancelOutgoingTransactionUseCase.kt @@ -8,4 +8,4 @@ class CancelOutgoingTransactionUseCase( suspend fun invoke() { return sendTransactionRepository.cancelCurrentTransaction() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ClearTransactionsUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ClearTransactionsUseCase.kt index 7fd7dce..1432fb8 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ClearTransactionsUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ClearTransactionsUseCase.kt @@ -8,4 +8,4 @@ class ClearTransactionsUseCase( suspend fun invoke() { return transactionRepository.clearTransactions() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ConfirmOutgoingTransactionUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ConfirmOutgoingTransactionUseCase.kt index 4b63554..b505d69 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ConfirmOutgoingTransactionUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ConfirmOutgoingTransactionUseCase.kt @@ -8,4 +8,4 @@ class ConfirmOutgoingTransactionUseCase( suspend fun invoke() { return sendTransactionRepository.confirmCurrentTransaction() } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveOutgoingTransactionUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveOutgoingTransactionUseCase.kt index a637267..3837001 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveOutgoingTransactionUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveOutgoingTransactionUseCase.kt @@ -10,4 +10,4 @@ class ObserveOutgoingTransactionUseCase( fun invoke(): StateFlow { return sendTransactionRepository.state } -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveTransactionsUseCase.kt b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveTransactionsUseCase.kt index 8a73887..816e295 100644 --- a/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveTransactionsUseCase.kt +++ b/app/src/main/java/by/alexandr7035/votekt/domain/usecase/transactions/ObserveTransactionsUseCase.kt @@ -6,4 +6,4 @@ class ObserveTransactionsUseCase( private val transactionRepository: TransactionRepository ) { fun invoke() = transactionRepository.observeTransactions() -} \ No newline at end of file +} diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalListPreviewProvider.kt b/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalListPreviewProvider.kt index ad56ed6..8a6cab3 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalListPreviewProvider.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalListPreviewProvider.kt @@ -3,12 +3,12 @@ package by.alexandr7035.votekt.ui.components.preview import androidx.compose.ui.tooling.preview.PreviewParameterProvider import by.alexandr7035.ethereum.model.Wei import by.alexandr7035.votekt.domain.core.BlockchainActionStatus -import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain -import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus -import by.alexandr7035.votekt.domain.model.transactions.TransactionType import by.alexandr7035.votekt.domain.model.proposal.Proposal import by.alexandr7035.votekt.domain.model.proposal.VoteType import by.alexandr7035.votekt.domain.model.proposal.VotingData +import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain +import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus +import by.alexandr7035.votekt.domain.model.transactions.TransactionType import org.kethereum.model.Address import java.math.BigInteger import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalPreviewProvider.kt b/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalPreviewProvider.kt index e9553b0..9b3fc5c 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalPreviewProvider.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/components/preview/ProposalPreviewProvider.kt @@ -3,12 +3,12 @@ package by.alexandr7035.votekt.ui.components.preview import androidx.compose.ui.tooling.preview.PreviewParameterProvider import by.alexandr7035.ethereum.model.Wei import by.alexandr7035.votekt.domain.core.BlockchainActionStatus -import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain -import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus -import by.alexandr7035.votekt.domain.model.transactions.TransactionType import by.alexandr7035.votekt.domain.model.proposal.Proposal import by.alexandr7035.votekt.domain.model.proposal.VoteType import by.alexandr7035.votekt.domain.model.proposal.VotingData +import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain +import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus +import by.alexandr7035.votekt.domain.model.transactions.TransactionType import org.kethereum.model.Address import java.math.BigInteger import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/core/AppViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/core/AppViewModel.kt index 72aaa4c..2ab71b6 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/core/AppViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/core/AppViewModel.kt @@ -8,10 +8,10 @@ import by.alexandr7035.ethereum.model.events.EthEventsSubscriptionState import by.alexandr7035.votekt.R import by.alexandr7035.votekt.domain.core.OperationResult import by.alexandr7035.votekt.domain.model.explorer.ExploreType -import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockUseCase -import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase import by.alexandr7035.votekt.domain.model.transactions.ReviewTransactionData import by.alexandr7035.votekt.domain.usecase.account.CheckAccountCreatedUseCase +import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockUseCase +import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase import by.alexandr7035.votekt.domain.usecase.explorer.GetBlockchainExplorerUrlUseCase import by.alexandr7035.votekt.domain.usecase.node.ConnectToNodeUseCase import by.alexandr7035.votekt.domain.usecase.transactions.ConfirmOutgoingTransactionUseCase diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/create/ConfirmPhraseViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/create/ConfirmPhraseViewModel.kt index 59e68e5..33f1f05 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/create/ConfirmPhraseViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/create/ConfirmPhraseViewModel.kt @@ -3,9 +3,9 @@ package by.alexandr7035.votekt.ui.feature.account.create import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import by.alexandr7035.votekt.domain.model.account.MnemonicWord import by.alexandr7035.votekt.domain.core.ErrorType import by.alexandr7035.votekt.domain.core.OperationResult +import by.alexandr7035.votekt.domain.model.account.MnemonicWord import by.alexandr7035.votekt.domain.usecase.account.AddAccountUseCase import by.alexandr7035.votekt.domain.usecase.account.ConfirmNewAccountUseCase import by.alexandr7035.votekt.domain.usecase.account.GetAccountConfirmationData diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/restore/RestoreAccountViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/restore/RestoreAccountViewModel.kt index 55f0eb4..34fb49e 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/restore/RestoreAccountViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/account/restore/RestoreAccountViewModel.kt @@ -2,8 +2,8 @@ package by.alexandr7035.votekt.ui.feature.account.restore import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import by.alexandr7035.votekt.domain.model.account.MnemonicWord import by.alexandr7035.votekt.domain.core.OperationResult +import by.alexandr7035.votekt.domain.model.account.MnemonicWord import by.alexandr7035.votekt.domain.usecase.account.AddAccountUseCase import by.alexandr7035.votekt.domain.usecase.account.VerifyMnemonicPhraseUseCase import by.alexandr7035.votekt.domain.usecase.debug.GetTestMnemonicUseCase diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/lockscreen/LockScreenViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/lockscreen/LockScreenViewModel.kt index 8da33c4..8038fff 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/lockscreen/LockScreenViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/lockscreen/LockScreenViewModel.kt @@ -5,16 +5,16 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import by.alexandr7035.votekt.R import by.alexandr7035.votekt.domain.core.OperationResult +import by.alexandr7035.votekt.domain.model.security.AuthenticationResult +import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability +import by.alexandr7035.votekt.domain.model.security.PinCode +import by.alexandr7035.votekt.domain.usecase.account.LogoutUseCase import by.alexandr7035.votekt.domain.usecase.applock.AuthenticateWithPinUseCase import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase import by.alexandr7035.votekt.domain.usecase.applock.DecryptPinWithBiometricsUseCase import by.alexandr7035.votekt.domain.usecase.applock.GetBiometricDecryptionCipherUseCase import by.alexandr7035.votekt.domain.usecase.applock.GetBiometricEncryptedPinUseCase -import by.alexandr7035.votekt.domain.model.security.AuthenticationResult -import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability -import by.alexandr7035.votekt.domain.model.security.PinCode -import by.alexandr7035.votekt.domain.usecase.account.LogoutUseCase import by.alexandr7035.votekt.ui.core.resources.UiText import by.alexandr7035.votekt.ui.feature.applock.core.AppLockUiState import by.alexandr7035.votekt.ui.feature.applock.core.BiometricAuthResult diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/biometrics/EnableBiometricsViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/biometrics/EnableBiometricsViewModel.kt index 970d670..e05eb0a 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/biometrics/EnableBiometricsViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/biometrics/EnableBiometricsViewModel.kt @@ -4,10 +4,10 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import by.alexandr7035.votekt.R import by.alexandr7035.votekt.domain.core.OperationResult -import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase -import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockedWithBiometricsUseCase import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability import by.alexandr7035.votekt.domain.model.security.PinCode +import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase +import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockedWithBiometricsUseCase import by.alexandr7035.votekt.ui.core.resources.UiText import by.alexandr7035.votekt.ui.feature.applock.core.BiometricAuthResult import by.alexandr7035.votekt.ui.feature.applock.core.BiometricsPromptUi diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/pincode/CreatePinViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/pincode/CreatePinViewModel.kt index ab8d44f..f131eb6 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/pincode/CreatePinViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/applock/setup/pincode/CreatePinViewModel.kt @@ -3,10 +3,10 @@ package by.alexandr7035.votekt.ui.feature.applock.setup.pincode import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import by.alexandr7035.votekt.R -import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase -import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockUseCase import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability import by.alexandr7035.votekt.domain.model.security.PinCode +import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase +import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockUseCase import by.alexandr7035.votekt.ui.core.resources.UiText import by.alexandr7035.votekt.ui.feature.applock.core.AppLockUiState import de.palm.composestateevents.consumed diff --git a/app/src/main/java/by/alexandr7035/votekt/ui/feature/proposals/details/VotingDetailsViewModel.kt b/app/src/main/java/by/alexandr7035/votekt/ui/feature/proposals/details/VotingDetailsViewModel.kt index 877c488..e4c5fd0 100644 --- a/app/src/main/java/by/alexandr7035/votekt/ui/feature/proposals/details/VotingDetailsViewModel.kt +++ b/app/src/main/java/by/alexandr7035/votekt/ui/feature/proposals/details/VotingDetailsViewModel.kt @@ -5,12 +5,12 @@ import androidx.lifecycle.viewModelScope import by.alexandr7035.votekt.domain.core.ErrorType import by.alexandr7035.votekt.domain.core.OperationResult import by.alexandr7035.votekt.domain.core.Uuid +import by.alexandr7035.votekt.domain.model.proposal.VoteType import by.alexandr7035.votekt.domain.usecase.contract.GetContractConfigurationUseCase import by.alexandr7035.votekt.domain.usecase.proposal.DeleteDraftProposalUseCase +import by.alexandr7035.votekt.domain.usecase.proposal.DeployDraftProposalUseCase import by.alexandr7035.votekt.domain.usecase.proposal.ObserveProposalUseCase import by.alexandr7035.votekt.domain.usecase.proposal.VoteOnProposalUseCase -import by.alexandr7035.votekt.domain.model.proposal.VoteType -import by.alexandr7035.votekt.domain.usecase.proposal.DeployDraftProposalUseCase import by.alexandr7035.votekt.ui.uiError import de.palm.composestateevents.consumed import de.palm.composestateevents.triggered