Skip to content

Commit d529a15

Browse files
authored
Merge pull request #906 from synonymdev/fix/create-wallet-passphrase-polish
fix: align top bar arrow and passphrase with ios
2 parents 93b36b5 + 8a6d56d commit d529a15

5 files changed

Lines changed: 22 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Improve Pubky profile restore, contact editing, and contact routing flows #905
1212

1313
### Fixed
14+
- Align top bar back arrow and passphrase input cursor/placeholder with iOS #906
1415
- Polish Terms of Use screen padding to match iOS #903
1516

1617
## [2.2.0] - 2026-04-07

app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ import androidx.compose.foundation.layout.height
1010
import androidx.compose.foundation.layout.imePadding
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.rememberScrollState
13-
import androidx.compose.foundation.shape.RoundedCornerShape
1413
import androidx.compose.foundation.text.KeyboardOptions
1514
import androidx.compose.foundation.verticalScroll
16-
import androidx.compose.material3.OutlinedTextField
17-
import androidx.compose.material3.Text
1815
import androidx.compose.runtime.Composable
1916
import androidx.compose.runtime.getValue
2017
import androidx.compose.runtime.mutableStateOf
@@ -35,13 +32,13 @@ import to.bitkit.ui.components.BodyM
3532
import to.bitkit.ui.components.Display
3633
import to.bitkit.ui.components.HighlightLabel
3734
import to.bitkit.ui.components.PrimaryButton
35+
import to.bitkit.ui.components.TextInput
3836
import to.bitkit.ui.components.TopBarSpacer
3937
import to.bitkit.ui.components.VerticalSpacer
4038
import to.bitkit.ui.components.mainRectHeight
4139
import to.bitkit.ui.scaffold.AppTopBar
4240
import to.bitkit.ui.shared.effects.BlockScreenshots
4341
import to.bitkit.ui.shared.util.screen
44-
import to.bitkit.ui.theme.AppTextFieldDefaults
4542
import to.bitkit.ui.theme.AppThemeSurface
4643
import to.bitkit.ui.theme.Colors
4744
import to.bitkit.ui.theme.TopBarHeight
@@ -98,12 +95,10 @@ fun CreateWalletWithPassphraseScreen(
9895
color = Colors.White64,
9996
)
10097
Spacer(modifier = Modifier.height(32.dp))
101-
OutlinedTextField(
98+
TextInput(
10299
value = bip39Passphrase,
103100
onValueChange = { bip39Passphrase = it },
104-
placeholder = { Text(text = stringResource(R.string.onboarding__passphrase)) },
105-
shape = RoundedCornerShape(8.dp),
106-
colors = AppTextFieldDefaults.semiTransparent,
101+
placeholder = stringResource(R.string.onboarding__passphrase),
107102
singleLine = true,
108103
keyboardOptions = KeyboardOptions(
109104
autoCorrectEnabled = false,

app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Row
66
import androidx.compose.foundation.layout.RowScope
77
import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.layout.size
9-
import androidx.compose.material.icons.Icons
10-
import androidx.compose.material.icons.automirrored.filled.ArrowBack
119
import androidx.compose.material3.CenterAlignedTopAppBar
1210
import androidx.compose.material3.ExperimentalMaterial3Api
1311
import androidx.compose.material3.Icon
@@ -39,7 +37,7 @@ fun AppTopBar(
3937
onBackClick: (() -> Unit)?,
4038
modifier: Modifier = Modifier,
4139
@DrawableRes icon: Int? = null,
42-
actions: @Composable (RowScope.() -> Unit) = {}
40+
actions: @Composable (RowScope.() -> Unit) = {},
4341
) {
4442
CenterAlignedTopAppBar(
4543
navigationIcon = {
@@ -84,7 +82,7 @@ fun BackNavIcon(
8482
modifier = modifier.testTag("NavigationBack")
8583
) {
8684
Icon(
87-
imageVector = Icons.AutoMirrored.Default.ArrowBack,
85+
painter = painterResource(R.drawable.ic_arrow_left),
8886
contentDescription = stringResource(R.string.common__back),
8987
modifier = Modifier.size(24.dp)
9088
)

app/src/main/java/to/bitkit/ui/theme/Defaults.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ object AppTextFieldDefaults {
4646
unfocusedIndicatorColor = Color.Transparent,
4747
focusedContainerColor = Colors.White10,
4848
unfocusedContainerColor = Colors.White10,
49+
cursorColor = Colors.Brand,
50+
errorCursorColor = Colors.Brand,
4951
errorIndicatorColor = Color.Transparent,
5052
errorContainerColor = Colors.White10,
5153
errorTextColor = Colors.Red,
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M3,12C3,11.586 3.336,11.25 3.75,11.25H20.25C20.664,11.25 21,11.586 21,12C21,12.414 20.664,12.75 20.25,12.75H3.75C3.336,12.75 3,12.414 3,12Z"
8+
android:fillColor="#ffffff"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M11.03,4.72C11.323,5.013 11.323,5.487 11.03,5.78L4.811,12L11.03,18.22C11.323,18.513 11.323,18.987 11.03,19.28C10.737,19.573 10.263,19.573 9.97,19.28L3.22,12.53C2.927,12.237 2.927,11.763 3.22,11.47L9.97,4.72C10.263,4.427 10.737,4.427 11.03,4.72Z"
12+
android:fillColor="#ffffff"
13+
android:fillType="evenOdd"/>
14+
</vector>

0 commit comments

Comments
 (0)