Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improve Pubky profile restore, contact editing, and contact routing flows #905

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

## [2.2.0] - 2026-04-07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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)
)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/to/bitkit/ui/theme/Defaults.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ic_arrow_left.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
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"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
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"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>
Loading