From d10bf152dfcb08274d68fd5a9d7a4669726a7de1 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 23 Apr 2026 10:09:20 -0300 Subject: [PATCH 1/3] fix: toolbar arrow left --- .../main/java/to/bitkit/ui/scaffold/AppTopBar.kt | 6 ++---- app/src/main/res/drawable/ic_arrow_left.xml | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/ic_arrow_left.xml diff --git a/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt b/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt index 9f45e302f..ab394ce98 100644 --- a/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt +++ b/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -39,7 +37,7 @@ fun AppTopBar( onBackClick: (() -> Unit)?, modifier: Modifier = Modifier, @DrawableRes icon: Int? = null, - actions: @Composable (RowScope.() -> Unit) = {} + actions: @Composable (RowScope.() -> Unit) = {}, ) { CenterAlignedTopAppBar( navigationIcon = { @@ -84,7 +82,7 @@ fun BackNavIcon( modifier = modifier.testTag("NavigationBack") ) { Icon( - imageVector = Icons.AutoMirrored.Default.ArrowBack, + painter = painterResource(R.drawable.ic_arrow_left), contentDescription = stringResource(R.string.common__back), modifier = Modifier.size(24.dp) ) diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml new file mode 100644 index 000000000..96cbe32c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_left.xml @@ -0,0 +1,14 @@ + + + + From 0d81c59e3b1dd6d45a6fe614c964f69b9d31eb2e Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 23 Apr 2026 10:19:38 -0300 Subject: [PATCH 2/3] fix: brand cursor color and inter-tight placeholder font --- .../ui/onboarding/CreateWalletWithPassphraseScreen.kt | 11 +++-------- app/src/main/java/to/bitkit/ui/theme/Defaults.kt | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt index adeb8dc56..6117e8521 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt @@ -10,11 +10,8 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -35,13 +32,13 @@ import to.bitkit.ui.components.BodyM import to.bitkit.ui.components.Display import to.bitkit.ui.components.HighlightLabel import to.bitkit.ui.components.PrimaryButton +import to.bitkit.ui.components.TextInput import to.bitkit.ui.components.TopBarSpacer import to.bitkit.ui.components.VerticalSpacer import to.bitkit.ui.components.mainRectHeight import to.bitkit.ui.scaffold.AppTopBar import to.bitkit.ui.shared.effects.BlockScreenshots import to.bitkit.ui.shared.util.screen -import to.bitkit.ui.theme.AppTextFieldDefaults import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors import to.bitkit.ui.theme.TopBarHeight @@ -98,12 +95,10 @@ fun CreateWalletWithPassphraseScreen( color = Colors.White64, ) Spacer(modifier = Modifier.height(32.dp)) - OutlinedTextField( + TextInput( value = bip39Passphrase, onValueChange = { bip39Passphrase = it }, - placeholder = { Text(text = stringResource(R.string.onboarding__passphrase)) }, - shape = RoundedCornerShape(8.dp), - colors = AppTextFieldDefaults.semiTransparent, + placeholder = stringResource(R.string.onboarding__passphrase), singleLine = true, keyboardOptions = KeyboardOptions( autoCorrectEnabled = false, diff --git a/app/src/main/java/to/bitkit/ui/theme/Defaults.kt b/app/src/main/java/to/bitkit/ui/theme/Defaults.kt index 1c7d71b12..ec19f9885 100644 --- a/app/src/main/java/to/bitkit/ui/theme/Defaults.kt +++ b/app/src/main/java/to/bitkit/ui/theme/Defaults.kt @@ -46,6 +46,8 @@ object AppTextFieldDefaults { unfocusedIndicatorColor = Color.Transparent, focusedContainerColor = Colors.White10, unfocusedContainerColor = Colors.White10, + cursorColor = Colors.Brand, + errorCursorColor = Colors.Brand, errorIndicatorColor = Color.Transparent, errorContainerColor = Colors.White10, errorTextColor = Colors.Red, From 5c2b9b55d93f3f3054b368fea16d9b64f20f835d Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 23 Apr 2026 10:22:45 -0300 Subject: [PATCH 3/3] chore: add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 299beaf0f..81742a56e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +- Align top bar back arrow and passphrase input cursor/placeholder with iOS #906 + ## [2.2.0] - 2026-04-07 ### Fixed