Merge branch 'feature/lottie-animation-recover-hd-account' into PERA-…

…1353-bottomsheet-hd-wallet
perawallet · Feb 28, 2025 · 4a9ba82 · 4a9ba82
2 parents 1e7ddf5 + 4da3cfb
commit 4a9ba82
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 31 deletions.
diff --git a/...com/algorand/android/modules/onboarding/pairledger/resultinfo/VerifyLedgerInfoFragment.kt b/...com/algorand/android/modules/onboarding/pairledger/resultinfo/VerifyLedgerInfoFragment.kt
@@ -26,7 +26,7 @@ import com.algorand.android.R
 import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -40,7 +40,7 @@ class VerifyLedgerInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/...ding/recoverypassphrase/enterpassphrase/ui/usecase/RecoverWithPassphrasePreviewUseCase.kt b/...ding/recoverypassphrase/enterpassphrase/ui/usecase/RecoverWithPassphrasePreviewUseCase.kt
@@ -32,6 +32,7 @@ import com.algorand.android.utils.splitMnemonic
 import com.algorand.android.utils.toShortenedAddress
 import com.algorand.wallet.account.detail.domain.model.AccountType
 import com.algorand.wallet.account.detail.domain.model.AccountType.Companion.wordCount
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 import java.util.Locale
 import javax.inject.Inject
@@ -126,9 +127,14 @@ class RecoverWithPassphrasePreviewUseCase @Inject constructor(
         )
     }
 
+    @SuppressWarnings("MagicNumber")
     fun validateEnteredMnemonics(preview: RecoverWithPassphrasePreview) = flow {
         try {
             emit(preview.copy(showLoadingDialogEvent = Event(Unit)))
+            // faking the duration of this process for some time before moving forward
+            // so the loading animation is effective.
+            // After deleting it delete also the @SuppressWarnings("MagicNumber")
+            delay(2500L)
             val mnemonics = passphraseInputConfigurationUtil.getOrderedInput(preview.passphraseInputGroupConfiguration)
             val privateKey = Sdk.mnemonicToPrivateKey(mnemonics.lowercase(Locale.ENGLISH))
             if (privateKey == null) {

diff --git a/...orand/android/modules/onboarding/recoverypassphrase/info/ui/RecoverAccountInfoFragment.kt b/...orand/android/modules/onboarding/recoverypassphrase/info/ui/RecoverAccountInfoFragment.kt
@@ -45,7 +45,7 @@ import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraCard
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraTitleText
 import com.algorand.wallet.account.detail.domain.model.AccountType
@@ -67,7 +67,7 @@ class RecoverAccountInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_key),
             contentDescription = stringResource(id = R.string.key),
             modifier = modifier

diff --git a/...droid/modules/onboarding/recoverypassphrase/result/ui/RecoverAccountResultInfoFragment.kt b/...droid/modules/onboarding/recoverypassphrase/result/ui/RecoverAccountResultInfoFragment.kt
@@ -24,7 +24,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,7 +37,7 @@ class RecoverAccountResultInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/...odules/rekey/rekeytoledgeraccount/resultinfo/ui/RekeyToLedgerAccountVerifyInfoFragment.kt b/...odules/rekey/rekeytoledgeraccount/resultinfo/ui/RekeyToLedgerAccountVerifyInfoFragment.kt
@@ -25,7 +25,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -38,7 +38,7 @@ class RekeyToLedgerAccountVerifyInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/...es/rekey/rekeytostandardaccount/resultinfo/ui/RekeyToStandardAccountVerifyInfoFragment.kt b/...es/rekey/rekeytostandardaccount/resultinfo/ui/RekeyToStandardAccountVerifyInfoFragment.kt
@@ -28,7 +28,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -52,7 +52,7 @@ class RekeyToStandardAccountVerifyInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/...com/algorand/android/modules/rekey/undorekey/resultinfo/ui/UndoRekeyVerifyInfoFragment.kt b/...com/algorand/android/modules/rekey/undorekey/resultinfo/ui/UndoRekeyVerifyInfoFragment.kt
@@ -27,7 +27,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -51,7 +51,7 @@ class UndoRekeyVerifyInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/app/src/main/kotlin/com/algorand/android/ui/common/warningconfirmation/BackupInfoFragment.kt b/app/src/main/kotlin/com/algorand/android/ui/common/warningconfirmation/BackupInfoFragment.kt
@@ -32,7 +32,7 @@ import com.algorand.android.ui.common.warningconfirmation.BackupInfoFragmentDire
 import com.algorand.android.ui.common.warningconfirmation.BackupInfoFragmentDirections.Companion.actionBackupInfoFragmentToWriteDownInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import com.algorand.android.utils.browser.openRecoveryPassphraseSupportUrl
@@ -60,7 +60,7 @@ class BackupInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_shield),
             contentDescription = stringResource(R.string.shield),
             modifier = modifier

diff --git a/...c/main/kotlin/com/algorand/android/ui/common/warningconfirmation/WriteDownInfoFragment.kt b/...c/main/kotlin/com/algorand/android/ui/common/warningconfirmation/WriteDownInfoFragment.kt
@@ -31,7 +31,7 @@ import com.algorand.android.ui.common.warningconfirmation.WriteDownInfoFragmentD
 import com.algorand.android.ui.common.warningconfirmation.WriteDownInfoFragmentDirections.Companion.actionWriteDownInfoFragmentToBackupPassphrasesNavigation
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -54,7 +54,7 @@ class WriteDownInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_pen),
             contentDescription = stringResource(R.string.pen),
             modifier = modifier

diff --git a/...n/kotlin/com/algorand/android/ui/lockpreference/BiometricAuthenticationEnabledFragment.kt b/...n/kotlin/com/algorand/android/ui/lockpreference/BiometricAuthenticationEnabledFragment.kt
@@ -23,7 +23,7 @@ import com.algorand.android.models.ToolbarConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.lockpreference.BiometricAuthenticationEnabledFragmentDirections.Companion.actionBiometricAuthenticationEnabledFragmentToHomeNavigation
 
@@ -39,7 +39,7 @@ class BiometricAuthenticationEnabledFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/app/src/main/kotlin/com/algorand/android/ui/lockpreference/BiometricRegistrationFragment.kt b/app/src/main/kotlin/com/algorand/android/ui/lockpreference/BiometricRegistrationFragment.kt
@@ -24,7 +24,7 @@ import com.algorand.android.models.ToolbarConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import com.algorand.android.utils.alertDialog
@@ -46,7 +46,7 @@ class BiometricRegistrationFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_faceid),
             contentDescription = stringResource(R.string.face_id),
             modifier = modifier

diff --git a/app/src/main/kotlin/com/algorand/android/ui/lockpreference/ChoosePasswordInfoFragment.kt b/app/src/main/kotlin/com/algorand/android/ui/lockpreference/ChoosePasswordInfoFragment.kt
@@ -31,7 +31,7 @@ import com.algorand.android.models.ToolbarConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import com.algorand.android.utils.preference.setLockDontAskAgain
@@ -71,7 +71,7 @@ class ChoosePasswordInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_locked),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/...nd/android/ui/register/createaccount/passphraseverified/PassphraseVerifiedInfoFragment.kt b/...nd/android/ui/register/createaccount/passphraseverified/PassphraseVerifiedInfoFragment.kt
@@ -24,7 +24,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -36,7 +36,7 @@ class PassphraseVerifiedInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_shield_check_large),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/.../com/algorand/android/ui/register/createaccount/result/CreateAccountResultInfoFragment.kt b/.../com/algorand/android/ui/register/createaccount/result/CreateAccountResultInfoFragment.kt
@@ -24,7 +24,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraSecondaryButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,7 +37,7 @@ class CreateAccountResultInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(R.string.check),
             modifier = modifier

diff --git a/app/src/main/kotlin/com/algorand/android/ui/register/watch/WatchAccountInfoFragment.kt b/app/src/main/kotlin/com/algorand/android/ui/register/watch/WatchAccountInfoFragment.kt
@@ -28,7 +28,7 @@ import com.algorand.android.models.ToolbarConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import com.algorand.android.ui.compose.widget.PeraWarningText
 import com.algorand.android.utils.browser.openWatchAccountSupportUrl
@@ -54,7 +54,7 @@ class WatchAccountInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_eye),
             contentDescription = stringResource(R.string.eye),
             modifier = modifier

diff --git a/...in/kotlin/com/algorand/android/ui/register/watch/result/WatchAccountResultInfoFragment.kt b/...in/kotlin/com/algorand/android/ui/register/watch/result/WatchAccountResultInfoFragment.kt
@@ -24,7 +24,7 @@ import com.algorand.android.models.FragmentConfiguration
 import com.algorand.android.ui.common.BaseInfoFragment
 import com.algorand.android.ui.compose.widget.PeraBodyText
 import com.algorand.android.ui.compose.widget.PeraHeadlineText
-import com.algorand.android.ui.compose.widget.PeraIconBig
+import com.algorand.android.ui.compose.widget.PeraIcon
 import com.algorand.android.ui.compose.widget.PeraPrimaryButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -36,7 +36,7 @@ class WatchAccountResultInfoFragment : BaseInfoFragment() {
 
     @Composable
     override fun Icon(modifier: Modifier) =
-        PeraIconBig(
+        PeraIcon(
             painter = painterResource(id = R.drawable.ic_check),
             contentDescription = stringResource(id = R.string.check),
             modifier = modifier

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -61,7 +61,7 @@ ktorContentNegotiation = "3.0.0"
 legacySupport = "1.0.0"
 lifecycle = "2.8.7"
 lifecycleExt = "2.2.0"
-lottie = "6.4.1"
+lottie = "6.6.2"
 material = "1.12.0"
 mockito = "5.4.0"
 mockk = "1.13.13"
@@ -84,6 +84,7 @@ tink = "1.14.0"
 xhdwalletapi = "1.1.0"
 walletConnectBom = "1.34.1"
 zxing = "4.3.0"
+uiTooling = "1.7.8"
 
 [libraries]
 
@@ -170,6 +171,7 @@ exoplayer = { module = "com.google.android.exoplayer:exoplayer", version.ref = "
 glide-image = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
+lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
 mpandroidchart = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpAndroidChart" }
 
 # Sensors - Bluetooth / Camera
@@ -234,6 +236,9 @@ kotlinx-coroutines-iosSimulatorArm64 = { module = "org.jetbrains.kotlinx:kotlinx
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+perf-plugin = { module = "com.google.firebase:perf-plugin", version.ref = "firebasePerformance" }
+
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" }
 
 [bundles]
 firebase = ["firebase-analytics",