Merge pull request #259 from synonymdev/feat/onboarding-test-ids

jvsena42 · web-flow · commit 67b46d0239ca · 2025-07-28T09:30:31.000-03:00
Onboarding test ids
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Bitkit Android (Native)
 
 > [!CAUTION]
-> ⚠️This **NOT** the repository of the Bitkit app from the app stores!
-> ⚠️Work-in-progress
+> ⚠️This **NOT** the repository of the Bitkit app from the app stores!<br>
+> ⚠️Work-in-progress<br>
 > The Bitkit app repository is here: **[github.com/synonymdev/bitkit](https://github.com/synonymdev/bitkit)**
 
 ---
diff --git a/app/src/main/java/to/bitkit/ui/MainActivity.kt b/app/src/main/java/to/bitkit/ui/MainActivity.kt
@@ -10,6 +10,9 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -75,7 +78,11 @@ class MainActivity : FragmentActivity() {
         installSplashScreen()
         enableAppEdgeToEdge()
         setContent {
-            AppThemeSurface {
+            AppThemeSurface(
+                modifier = Modifier.semantics {
+                    testTagsAsResourceId = true // see https://github.com/appium/appium/issues/15138
+                }
+            ) {
                 val scope = rememberCoroutineScope()
                 if (!walletViewModel.walletExists) {
                     val startupNavController = rememberNavController()
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
@@ -33,10 +34,11 @@ import to.bitkit.ui.utils.withAccent
 fun CreateWalletScreen(
     onCreateClick: () -> Unit,
     onRestoreClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
     ) {
         Image(
@@ -70,20 +72,24 @@ fun CreateWalletScreen(
                 PrimaryButton(
                     text = stringResource(R.string.onboarding__new_wallet),
                     onClick = onCreateClick,
-                    modifier = Modifier.weight(1f)
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("NewWallet")
                 )
                 SecondaryButton(
                     text = stringResource(R.string.onboarding__restore),
                     onClick = onRestoreClick,
-                    modifier = Modifier.weight(1f)
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("RestoreWallet")
                 )
             }
             Spacer(modifier = Modifier.height(16.dp))
         }
     }
 }
 
-@Preview(showBackground = true)
+@Preview(showSystemUi = true)
 @Composable
 private fun CreateWalletScreenPreview() {
     AppThemeSurface {
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
@@ -122,19 +123,21 @@ fun CreateWalletWithPassphraseScreen(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = 4.dp)
+                    .testTag("PassphraseInput")
             )
             Spacer(modifier = Modifier.height(32.dp))
             PrimaryButton(
                 text = stringResource(R.string.onboarding__create_new_wallet),
                 onClick = { onCreateClick(bip39Passphrase) },
                 enabled = bip39Passphrase.isNotBlank(),
+                modifier = Modifier.testTag("CreateNewWallet")
             )
             Spacer(modifier = Modifier.height(32.dp))
         }
     }
 }
 
-@Preview(showBackground = true)
+@Preview(showSystemUi = true)
 @Composable
 private fun CreateWalletWithPassphraseScreenPreview() {
     AppThemeSurface {
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/IntroScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/IntroScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -80,12 +81,16 @@ fun IntroScreen(
                     PrimaryButton(
                         text = stringResource(R.string.onboarding__get_started),
                         onClick = onStartClick,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier
+                            .weight(1f)
+                            .testTag("GetStarted")
                     )
                     SecondaryButton(
                         text = stringResource(R.string.onboarding__skip_intro),
                         onClick = onSkipClick,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier
+                            .weight(1f)
+                            .testTag("SkipIntro")
                     )
                 }
             }
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -77,6 +78,7 @@ fun OnboardingSlidesScreen(
                     title = stringResource(R.string.onboarding__slide0_header),
                     titleAccentColor = Colors.Blue,
                     text = stringResource(R.string.onboarding__slide0_text),
+                    modifier = Modifier.testTag("Slide0")
                 )
 
                 1 -> OnboardingTab(
@@ -85,25 +87,29 @@ fun OnboardingSlidesScreen(
                     titleAccentColor = Colors.Purple,
                     text = stringResource(R.string.onboarding__slide1_text),
                     disclaimerText = stringResource(R.string.onboarding__slide1_note), // TODO use GeoBlocking state
+                    modifier = Modifier.testTag("Slide1")
                 )
 
                 2 -> OnboardingTab(
                     imageResId = R.drawable.spark,
                     title = stringResource(R.string.onboarding__slide2_header),
                     titleAccentColor = Colors.Yellow,
                     text = stringResource(R.string.onboarding__slide2_text),
+                    modifier = Modifier.testTag("Slide2")
                 )
 
                 3 -> OnboardingTab(
                     imageResId = R.drawable.shield,
                     title = stringResource(R.string.onboarding__slide3_header),
                     titleAccentColor = Colors.Green,
                     text = stringResource(R.string.onboarding__slide3_text),
+                    modifier = Modifier.testTag("Slide3")
                 )
 
                 4 -> CreateWalletScreen(
                     onCreateClick = onCreateClick,
                     onRestoreClick = onRestoreClick,
+                    modifier = Modifier.testTag("Slide4")
                 )
             }
         }
@@ -153,7 +159,10 @@ fun OnboardingSlidesScreen(
         title = { },
         actions = {
             if (pagerState.currentPage == 4) {
-                TextButton(onClick = onAdvancedSetupClick) {
+                TextButton(
+                    onClick = onAdvancedSetupClick,
+                    modifier = Modifier.testTag("Passphrase")
+                ) {
                     Text(
                         text = stringResource(R.string.onboarding__advanced_setup),
                         fontSize = 17.sp,
@@ -162,9 +171,12 @@ fun OnboardingSlidesScreen(
                     )
                 }
             } else {
-                TextButton(onClick = {
-                    scope.launch { pagerState.animateScrollToPage(4) }
-                }) {
+                TextButton(
+                    onClick = {
+                        scope.launch { pagerState.animateScrollToPage(pagerState.pageCount - 1) }
+                    },
+                    modifier = Modifier.testTag("SkipButton")
+                ) {
                     Text(
                         text = stringResource(R.string.onboarding__skip),
                         fontSize = 17.sp,
@@ -218,7 +230,7 @@ fun OnboardingTab(
     }
 }
 
-@Preview(showSystemUi = false)
+@Preview(showSystemUi = true)
 @Composable
 private fun OnboardingViewPreview() {
     AppThemeSurface {
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/RestoreWalletScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/RestoreWalletScreen.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.layout.positionInParent
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
@@ -283,6 +284,7 @@ fun RestoreWalletView(
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(top = 4.dp)
+                            .testTag("PassphraseInput")
                     )
                     Spacer(modifier = Modifier.height(16.dp))
                     BodyS(
@@ -335,7 +337,9 @@ fun RestoreWalletView(
                                 bip39Passphrase = ""
                             },
                             enabled = areButtonsEnabled,
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier
+                                .weight(1f)
+                                .testTag("AdvancedButton")
                         )
                     }
                     PrimaryButton(
@@ -344,7 +348,9 @@ fun RestoreWalletView(
                             onRestoreClick(bip39Mnemonic, bip39Passphrase.takeIf { it.isNotEmpty() })
                         },
                         enabled = areButtonsEnabled,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier
+                            .weight(1f)
+                            .testTag("RestoreButton")
                     )
                 }
             }
@@ -443,7 +449,7 @@ fun MnemonicInputField(
         modifier = Modifier
             .onFocusChanged { onFocusChanged(it.isFocused) }
             .onGloballyPositioned { coordinates ->
-                val position = coordinates.positionInParent().y.toInt() * 2 //double the scroll to ensure enough space
+                val position = coordinates.positionInParent().y.toInt() * 2 // double the scroll to ensure enough space
                 onPositionChanged(position)
             }
     )
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/TermsOfUseScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/TermsOfUseScreen.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
@@ -71,6 +72,7 @@ fun TermsOfUseScreen(
                         .fillMaxWidth()
                         .padding(horizontal = horizontalPadding)
                         .verticalScroll(rememberScrollState())
+                        .testTag("TOS")
                 ) {
                     Spacer(modifier = Modifier.height(16.dp))
                     Display(text = stringResource(R.string.onboarding__tos_header).withAccent())
@@ -102,15 +104,19 @@ fun TermsOfUseScreen(
                         .withAccentLink(Env.TERMS_OF_USE_URL),
                     isChecked = termsAccepted,
                     onCheckedChange = { termsAccepted = it },
-                    modifier = Modifier.padding(horizontal = horizontalPadding)
+                    modifier = Modifier
+                        .padding(horizontal = horizontalPadding)
+                        .testTag("Check1")
                 )
                 CheckButton(
                     title = stringResource(R.string.onboarding__pp_checkbox),
                     htmlText = stringResource(R.string.onboarding__pp_checkbox_value)
                         .withAccentLink("https://bitkit.to/privacy-policy"),
                     isChecked = privacyAccepted,
                     onCheckedChange = { privacyAccepted = it },
-                    modifier = Modifier.padding(horizontal = horizontalPadding)
+                    modifier = Modifier
+                        .padding(horizontal = horizontalPadding)
+                        .testTag("Check2")
                 )
 
                 Spacer(modifier = Modifier.height(24.dp))
@@ -119,7 +125,9 @@ fun TermsOfUseScreen(
                     text = stringResource(R.string.common__continue),
                     onClick = onNavigateToIntro,
                     enabled = termsAccepted && privacyAccepted,
-                    modifier = Modifier.padding(horizontal = horizontalPadding)
+                    modifier = Modifier
+                        .padding(horizontal = horizontalPadding)
+                        .testTag("Continue")
                 )
             }
         }
@@ -185,7 +193,7 @@ private fun CheckmarkBox(isChecked: Boolean) {
     }
 }
 
-@Preview
+@Preview(showSystemUi = true)
 @Composable
 private fun TermsPreview() {
     AppThemeSurface {
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/WalletInitResultView.kt b/app/src/main/java/to/bitkit/ui/onboarding/WalletInitResultView.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -109,13 +110,20 @@ fun WalletInitResultView(
                 }
                 onButtonClick()
             },
+            modifier = Modifier.testTag(
+                when (result) {
+                    is WalletInitResult.Restored -> "GetStartedButton"
+                    is WalletInitResult.Failed -> "TryAgainButton"
+                }
+            )
         )
 
         if (result is WalletInitResult.Failed && retryCount > 1 && onProceedWithoutRestore != null) {
             Spacer(modifier = Modifier.height(12.dp))
             SecondaryButton(
                 text = stringResource(R.string.onboarding__restore_no_backup_button),
-                onClick = { showProceedDialog = true }
+                onClick = { showProceedDialog = true },
+                modifier = Modifier.testTag("ProceedWithoutBackupButton")
             )
         }
 
@@ -132,7 +140,8 @@ fun WalletInitResultView(
                 retryCount = 0
                 onProceedWithoutRestore?.invoke()
             },
-            onDismiss = { showProceedDialog = false }
+            onDismiss = { showProceedDialog = false },
+            modifier = Modifier.testTag("ProceedWithoutBackupDialog")
         )
     }
 }
@@ -149,6 +158,10 @@ fun WalletInitResultViewRestoredPreview() {
 @Composable
 fun WalletInitResultViewErrorPreview() {
     AppThemeSurface {
-        WalletInitResultView(result = WalletInitResult.Failed(Error("Something went wrong")), onButtonClick = {})
+        WalletInitResultView(
+            result = WalletInitResult.Failed(Error("Something went wrong")),
+            onButtonClick = {},
+            onProceedWithoutRestore = {},
+        )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/onboarding/WarningMultipleDevicesScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/WarningMultipleDevicesScreen.kt
diff --git a/app/src/main/java/to/bitkit/ui/theme/Theme.kt b/app/src/main/java/to/bitkit/ui/theme/Theme.kt

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import androidx.compose.runtime.setValue`
`32`	`32`	`import androidx.compose.ui.Alignment`
`33`	`33`	`import androidx.compose.ui.Modifier`
`34`	`34`	`import androidx.compose.ui.layout.ContentScale`
	`35`	`+import androidx.compose.ui.platform.testTag`
`35`	`36`	`import androidx.compose.ui.res.painterResource`
`36`	`37`	`import androidx.compose.ui.res.stringResource`
`37`	`38`	`import androidx.compose.ui.text.input.ImeAction`
`@@ -122,19 +123,21 @@ fun CreateWalletWithPassphraseScreen(`
`122`	`123`	`modifier = Modifier`
`123`	`124`	`.fillMaxWidth()`
`124`	`125`	`.padding(top = 4.dp)`
	`126`	`+ .testTag("PassphraseInput")`
`125`	`127`	`)`
`126`	`128`	`Spacer(modifier = Modifier.height(32.dp))`
`127`	`129`	`PrimaryButton(`
`128`	`130`	`text = stringResource(R.string.onboarding__create_new_wallet),`
`129`	`131`	`onClick = { onCreateClick(bip39Passphrase) },`
`130`	`132`	`enabled = bip39Passphrase.isNotBlank(),`
	`133`	`+ modifier = Modifier.testTag("CreateNewWallet")`
`131`	`134`	`)`
`132`	`135`	`Spacer(modifier = Modifier.height(32.dp))`
`133`	`136`	`}`
`134`	`137`	`}`
`135`	`138`	`}`
`136`	`139`
`137`		`-@Preview(showBackground = true)`
	`140`	`+@Preview(showSystemUi = true)`
`138`	`141`	`@Composable`
`139`	`142`	`private fun CreateWalletWithPassphraseScreenPreview() {`
`140`	`143`	`AppThemeSurface {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ import androidx.compose.ui.Modifier`
`44`	`44`	`import androidx.compose.ui.focus.onFocusChanged`
`45`	`45`	`import androidx.compose.ui.layout.onGloballyPositioned`
`46`	`46`	`import androidx.compose.ui.layout.positionInParent`
	`47`	`+import androidx.compose.ui.platform.testTag`
`47`	`48`	`import androidx.compose.ui.res.stringResource`
`48`	`49`	`import androidx.compose.ui.text.font.FontWeight`
`49`	`50`	`import androidx.compose.ui.text.input.ImeAction`
`@@ -283,6 +284,7 @@ fun RestoreWalletView(`
`283`	`284`	`modifier = Modifier`
`284`	`285`	`.fillMaxWidth()`
`285`	`286`	`.padding(top = 4.dp)`
	`287`	`+ .testTag("PassphraseInput")`
`286`	`288`	`)`
`287`	`289`	`Spacer(modifier = Modifier.height(16.dp))`
`288`	`290`	`BodyS(`
`@@ -335,7 +337,9 @@ fun RestoreWalletView(`
`335`	`337`	`bip39Passphrase = ""`
`336`	`338`	`},`
`337`	`339`	`enabled = areButtonsEnabled,`
`338`		`- modifier = Modifier.weight(1f)`
	`340`	`+ modifier = Modifier`
	`341`	`+ .weight(1f)`
	`342`	`+ .testTag("AdvancedButton")`
`339`	`343`	`)`
`340`	`344`	`}`
`341`	`345`	`PrimaryButton(`
`@@ -344,7 +348,9 @@ fun RestoreWalletView(`
`344`	`348`	`onRestoreClick(bip39Mnemonic, bip39Passphrase.takeIf { it.isNotEmpty() })`
`345`	`349`	`},`
`346`	`350`	`enabled = areButtonsEnabled,`
`347`		`- modifier = Modifier.weight(1f)`
	`351`	`+ modifier = Modifier`
	`352`	`+ .weight(1f)`
	`353`	`+ .testTag("RestoreButton")`
`348`	`354`	`)`
`349`	`355`	`}`
`350`	`356`	`}`
`@@ -443,7 +449,7 @@ fun MnemonicInputField(`
`443`	`449`	`modifier = Modifier`
`444`	`450`	`.onFocusChanged { onFocusChanged(it.isFocused) }`
`445`	`451`	`.onGloballyPositioned { coordinates ->`
`446`		`- val position = coordinates.positionInParent().y.toInt() * 2 //double the scroll to ensure enough space`
	`452`	`+ val position = coordinates.positionInParent().y.toInt() * 2 // double the scroll to ensure enough space`
`447`	`453`	`onPositionChanged(position)`
`448`	`454`	`}`
`449`	`455`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import androidx.compose.runtime.remember`
`17`	`17`	`import androidx.compose.runtime.setValue`
`18`	`18`	`import androidx.compose.ui.Alignment`
`19`	`19`	`import androidx.compose.ui.Modifier`
	`20`	`+import androidx.compose.ui.platform.testTag`
`20`	`21`	`import androidx.compose.ui.res.painterResource`
`21`	`22`	`import androidx.compose.ui.res.stringResource`
`22`	`23`	`import androidx.compose.ui.tooling.preview.Preview`
`@@ -109,13 +110,20 @@ fun WalletInitResultView(`
`109`	`110`	`}`
`110`	`111`	`onButtonClick()`
`111`	`112`	`},`
	`113`	`+ modifier = Modifier.testTag(`
	`114`	`+ when (result) {`
	`115`	`+ is WalletInitResult.Restored -> "GetStartedButton"`
	`116`	`+ is WalletInitResult.Failed -> "TryAgainButton"`
	`117`	`+ }`
	`118`	`+ )`
`112`	`119`	`)`
`113`	`120`
`114`	`121`	`if (result is WalletInitResult.Failed && retryCount > 1 && onProceedWithoutRestore != null) {`
`115`	`122`	`Spacer(modifier = Modifier.height(12.dp))`
`116`	`123`	`SecondaryButton(`
`117`	`124`	`text = stringResource(R.string.onboarding__restore_no_backup_button),`
`118`		`- onClick = { showProceedDialog = true }`
	`125`	`+ onClick = { showProceedDialog = true },`
	`126`	`+ modifier = Modifier.testTag("ProceedWithoutBackupButton")`
`119`	`127`	`)`
`120`	`128`	`}`
`121`	`129`
`@@ -132,7 +140,8 @@ fun WalletInitResultView(`
`132`	`140`	`retryCount = 0`
`133`	`141`	`onProceedWithoutRestore?.invoke()`
`134`	`142`	`},`
`135`		`- onDismiss = { showProceedDialog = false }`
	`143`	`+ onDismiss = { showProceedDialog = false },`
	`144`	`+ modifier = Modifier.testTag("ProceedWithoutBackupDialog")`
`136`	`145`	`)`
`137`	`146`	`}`
`138`	`147`	`}`
`@@ -149,6 +158,10 @@ fun WalletInitResultViewRestoredPreview() {`
`149`	`158`	`@Composable`
`150`	`159`	`fun WalletInitResultViewErrorPreview() {`
`151`	`160`	`AppThemeSurface {`
`152`		`- WalletInitResultView(result = WalletInitResult.Failed(Error("Something went wrong")), onButtonClick = {})`
	`161`	`+ WalletInitResultView(`
	`162`	`+ result = WalletInitResult.Failed(Error("Something went wrong")),`
	`163`	`+ onButtonClick = {},`
	`164`	`+ onProceedWithoutRestore = {},`
	`165`	`+ )`
`153`	`166`	`}`
`154`	`167`	`}`