From 3d2bec2889f2fb56766b389f2d5818527b990f68 Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 10:36:24 -0300 Subject: [PATCH 1/9] feat: create HighlightLabel.kt component --- .../to/bitkit/ui/shared/HighlightLabel.kt | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt new file mode 100644 index 0000000000..a09035f19a --- /dev/null +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -0,0 +1,97 @@ +package to.bitkit.ui.shared + + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import to.bitkit.R +import to.bitkit.ui.theme.AppThemeSurface + +@Composable +fun HighlightLabel(label: String, modifier: Modifier = Modifier) { + val orangeColor = Color(0xFFFF4400) + + Box(modifier = modifier.size(106.dp, 42.dp)) { + // Logo shapes + Canvas(modifier = Modifier.fillMaxSize()) { + // Calculate scaling factor to maintain proportions + val scaleX = size.width / 106f + val scaleY = size.height / 42f + + // Top right triangle (opacity 0.5) + drawPath( + path = Path().apply { + moveTo(91.7534f * scaleX, 26f * scaleY) + lineTo(106f * scaleX, 42f * scaleY) + lineTo(106f * scaleX, 26f * scaleY) + close() + }, + color = orangeColor.copy(alpha = 0.5f) + ) + + // Top left triangle + drawPath( + path = Path().apply { + moveTo(0f, 0f) + lineTo(13f * scaleX, 13f * scaleY) + lineTo(13f * scaleX, 0f) + close() + }, + color = orangeColor + ) + + // Bottom left triangle + drawPath( + path = Path().apply { + moveTo(0f, 26f * scaleY) + lineTo(13f * scaleX, 13f * scaleY) + lineTo(13f * scaleX, 26f * scaleY) + close() + }, + color = orangeColor + ) + + // Main rectangle + drawRect( + color = orangeColor, + topLeft = Offset(13f * scaleX, 0f), + size = androidx.compose.ui.geometry.Size(93f * scaleX, 26f * scaleY) + ) + } + + Box( + modifier = Modifier + .size((93).dp, 26.dp) + .align(Alignment.TopStart) + .offset(x = 13.dp, y = 0.dp), + contentAlignment = Alignment.Center + ) { + Text( + text = label, + color = Color.White, + textAlign = TextAlign.Center + ) + } + } +} + +@Preview() +@Composable +private fun Preview() { + AppThemeSurface { + HighlightLabel(stringResource(R.string.onboarding__advanced)) + } +} From 1df750011e323c93b417330a5ce3b6ddb0631e2f Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 10:50:12 -0300 Subject: [PATCH 2/9] refactor: make the HighlightLabel.kt more flexible --- .../to/bitkit/ui/shared/HighlightLabel.kt | 135 ++++++++++++------ 1 file changed, 91 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt index a09035f19a..b761149210 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -3,51 +3,67 @@ package to.bitkit.ui.shared import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.offset -import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Path +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import to.bitkit.R import to.bitkit.ui.theme.AppThemeSurface @Composable -fun HighlightLabel(label: String, modifier: Modifier = Modifier) { +fun HighlightLabel( + text: String, + modifier: Modifier = Modifier, + textStyle: TextStyle = TextStyle( + color = Color.White, + fontSize = 14.sp, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center + ) +) { val orangeColor = Color(0xFFFF4400) + val density = LocalDensity.current + val triangleWidth = 13.dp + val triangleWidthPx = with(density) { triangleWidth.toPx() } + val logoHeight = 42.dp + val mainRectHeight = 26.dp + val mainRectHeightPx = with(density) { mainRectHeight.toPx() } + val logoHeightPx = with(density) { logoHeight.toPx() } - Box(modifier = modifier.size(106.dp, 42.dp)) { - // Logo shapes - Canvas(modifier = Modifier.fillMaxSize()) { - // Calculate scaling factor to maintain proportions - val scaleX = size.width / 106f - val scaleY = size.height / 42f - - // Top right triangle (opacity 0.5) - drawPath( - path = Path().apply { - moveTo(91.7534f * scaleX, 26f * scaleY) - lineTo(106f * scaleX, 42f * scaleY) - lineTo(106f * scaleX, 26f * scaleY) - close() - }, - color = orangeColor.copy(alpha = 0.5f) - ) - + Row( + modifier = modifier.height(logoHeight), + verticalAlignment = Alignment.Top + ) { + // Left triangles + Canvas( + modifier = Modifier + .width(triangleWidth) + .fillMaxHeight() + ) { // Top left triangle drawPath( path = Path().apply { moveTo(0f, 0f) - lineTo(13f * scaleX, 13f * scaleY) - lineTo(13f * scaleX, 0f) + lineTo(triangleWidthPx, triangleWidthPx) + lineTo(triangleWidthPx, 0f) close() }, color = orangeColor @@ -56,42 +72,73 @@ fun HighlightLabel(label: String, modifier: Modifier = Modifier) { // Bottom left triangle drawPath( path = Path().apply { - moveTo(0f, 26f * scaleY) - lineTo(13f * scaleX, 13f * scaleY) - lineTo(13f * scaleX, 26f * scaleY) + moveTo(0f, mainRectHeightPx) + lineTo(triangleWidthPx, triangleWidthPx) + lineTo(triangleWidthPx, mainRectHeightPx) close() }, color = orangeColor ) - - // Main rectangle - drawRect( - color = orangeColor, - topLeft = Offset(13f * scaleX, 0f), - size = androidx.compose.ui.geometry.Size(93f * scaleX, 26f * scaleY) - ) } + // Text with background Box( modifier = Modifier - .size((93).dp, 26.dp) - .align(Alignment.TopStart) - .offset(x = 13.dp, y = 0.dp), + .height(mainRectHeight) + .wrapContentWidth() + .drawBehind { + // Main rectangle (flexible width based on text) + drawRect( + color = orangeColor, + size = Size(this.size.width, this.size.height) + ) + + // Top right triangle (semi-transparent) + if (this.size.width > 0) { + drawPath( + path = Path().apply { + val startX = this@drawBehind.size.width - triangleWidthPx + moveTo(startX, this@drawBehind.size.height) + lineTo(this@drawBehind.size.width, logoHeightPx) + lineTo(this@drawBehind.size.width, this@drawBehind.size.height) + close() + }, + color = orangeColor.copy(alpha = 0.5f) + ) + } + }, contentAlignment = Alignment.Center ) { Text( - text = label, - color = Color.White, - textAlign = TextAlign.Center + text = text, + style = textStyle, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp) ) } } } -@Preview() +// Usage example +@Preview(showBackground = true) +@Composable +fun FlexibleLogoPreview() { + AppThemeSurface { + HighlightLabel(text = stringResource(R.string.onboarding__advanced)) + } +} + +@Preview(showBackground = true) +@Composable +fun ShortTextLogoPreview() { + AppThemeSurface { + HighlightLabel(text = "GAME") + } +} + +@Preview(showBackground = true) @Composable -private fun Preview() { +fun LongTextLogoPreview() { AppThemeSurface { - HighlightLabel(stringResource(R.string.onboarding__advanced)) + HighlightLabel(text = "SUPER ADVENTURE GAME DELUXE") } } From e39ba2056631c5ff51220fb5b9ad293e0c636f0b Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 10:51:25 -0300 Subject: [PATCH 3/9] refactor: get orange color from colors --- .../main/java/to/bitkit/ui/shared/HighlightLabel.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt index b761149210..daa75b8ff2 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import to.bitkit.R import to.bitkit.ui.theme.AppThemeSurface +import to.bitkit.ui.theme.Colors.Brand @Composable fun HighlightLabel( @@ -39,7 +40,6 @@ fun HighlightLabel( textAlign = TextAlign.Center ) ) { - val orangeColor = Color(0xFFFF4400) val density = LocalDensity.current val triangleWidth = 13.dp val triangleWidthPx = with(density) { triangleWidth.toPx() } @@ -66,7 +66,7 @@ fun HighlightLabel( lineTo(triangleWidthPx, 0f) close() }, - color = orangeColor + color = Brand ) // Bottom left triangle @@ -77,7 +77,7 @@ fun HighlightLabel( lineTo(triangleWidthPx, mainRectHeightPx) close() }, - color = orangeColor + color = Brand ) } @@ -89,7 +89,7 @@ fun HighlightLabel( .drawBehind { // Main rectangle (flexible width based on text) drawRect( - color = orangeColor, + color = Brand, size = Size(this.size.width, this.size.height) ) @@ -103,7 +103,7 @@ fun HighlightLabel( lineTo(this@drawBehind.size.width, this@drawBehind.size.height) close() }, - color = orangeColor.copy(alpha = 0.5f) + color = Brand.copy(alpha = 0.5f) ) } }, From 20e6391a9c777b4b49bb87a93dfbca86a4549e83 Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 11:47:47 -0300 Subject: [PATCH 4/9] refactor: implement Caption13Up --- app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt index daa75b8ff2..1e95f1939b 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -26,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import to.bitkit.R +import to.bitkit.ui.components.Caption13Up import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors.Brand @@ -109,9 +110,8 @@ fun HighlightLabel( }, contentAlignment = Alignment.Center ) { - Text( + Caption13Up( text = text, - style = textStyle, modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp) ) } @@ -139,6 +139,6 @@ fun ShortTextLogoPreview() { @Composable fun LongTextLogoPreview() { AppThemeSurface { - HighlightLabel(text = "SUPER ADVENTURE GAME DELUXE") + HighlightLabel(text = "NOT YOUR KEYS, NOT YOUR COINS") } } From 6ad5ee47d790eb4c58874671250f92d37c5e6f12 Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 13:50:17 -0300 Subject: [PATCH 5/9] refactor: remove imports --- .../main/java/to/bitkit/ui/shared/HighlightLabel.kt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt index 1e95f1939b..4fd5e277f4 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -9,22 +9,16 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentWidth -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Size -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Path import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import to.bitkit.R import to.bitkit.ui.components.Caption13Up import to.bitkit.ui.theme.AppThemeSurface @@ -34,12 +28,6 @@ import to.bitkit.ui.theme.Colors.Brand fun HighlightLabel( text: String, modifier: Modifier = Modifier, - textStyle: TextStyle = TextStyle( - color = Color.White, - fontSize = 14.sp, - fontWeight = FontWeight.Bold, - textAlign = TextAlign.Center - ) ) { val density = LocalDensity.current val triangleWidth = 13.dp From 911b9aabeb4023aaf31ab55da8886803cf2d488b Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 13:54:47 -0300 Subject: [PATCH 6/9] feat: implement tag "advanced" --- .../ui/onboarding/CreateWalletWithPassphraseScreen.kt | 11 +++++++++++ .../main/java/to/bitkit/ui/shared/HighlightLabel.kt | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 bc2c9fd170..cbf71dcd3d 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt @@ -3,6 +3,7 @@ package to.bitkit.ui.onboarding import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -25,6 +26,7 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults.MediumAppBarCollapsedHeight import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -47,6 +49,8 @@ import to.bitkit.R import to.bitkit.ui.components.BodyM import to.bitkit.ui.components.Display import to.bitkit.ui.components.PrimaryButton +import to.bitkit.ui.shared.HighlightLabel +import to.bitkit.ui.shared.mainRectHeight import to.bitkit.ui.theme.AppTextFieldDefaults import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors @@ -121,6 +125,13 @@ fun CreateWalletWithPassphraseScreen( ) Spacer(modifier = Modifier.height(32.dp)) } + + HighlightLabel( + stringResource(R.string.onboarding__advanced).uppercase(), + Modifier + .align(Alignment.TopEnd) + .padding(top = MediumAppBarCollapsedHeight / 2 - (mainRectHeight / 2)) + ) } } diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt index 4fd5e277f4..66f3f70411 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt @@ -24,6 +24,8 @@ import to.bitkit.ui.components.Caption13Up import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors.Brand +val mainRectHeight = 26.dp + @Composable fun HighlightLabel( text: String, @@ -33,7 +35,6 @@ fun HighlightLabel( val triangleWidth = 13.dp val triangleWidthPx = with(density) { triangleWidth.toPx() } val logoHeight = 42.dp - val mainRectHeight = 26.dp val mainRectHeightPx = with(density) { mainRectHeight.toPx() } val logoHeightPx = with(density) { logoHeight.toPx() } From 13eb8f53f4d24896f22c2997ed9f66ac797f25f8 Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 14:07:21 -0300 Subject: [PATCH 7/9] fix: tag alignment --- .../CreateWalletWithPassphraseScreen.kt | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 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 cbf71dcd3d..1dadbe0adc 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt @@ -67,18 +67,30 @@ fun CreateWalletWithPassphraseScreen( Box( modifier = Modifier.fillMaxSize(), ) { - TopAppBar( - title = {}, - navigationIcon = { - IconButton(onClick = onBackClick) { - Icon( - imageVector = Icons.AutoMirrored.Default.ArrowBack, - contentDescription = stringResource(R.string.common__back), - modifier = Modifier.size(24.dp) - ) - } - }, - ) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.Bottom + ) { + TopAppBar( + title = {}, + navigationIcon = { + IconButton(onClick = onBackClick) { + Icon( + imageVector = Icons.AutoMirrored.Default.ArrowBack, + contentDescription = stringResource(R.string.common__back), + modifier = Modifier.size(24.dp) + ) + } + }, + modifier = Modifier.weight(1f) + ) + + HighlightLabel( + stringResource(R.string.onboarding__advanced).uppercase(), + Modifier + .padding(top = MediumAppBarCollapsedHeight / 2 - (mainRectHeight / 2)) + ) + } Column( modifier = Modifier .align(Alignment.BottomCenter) @@ -125,13 +137,6 @@ fun CreateWalletWithPassphraseScreen( ) Spacer(modifier = Modifier.height(32.dp)) } - - HighlightLabel( - stringResource(R.string.onboarding__advanced).uppercase(), - Modifier - .align(Alignment.TopEnd) - .padding(top = MediumAppBarCollapsedHeight / 2 - (mainRectHeight / 2)) - ) } } From 91123d6a4810a4df54cedcb3921d023f71c7e7ad Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Mon, 10 Mar 2025 14:26:59 -0300 Subject: [PATCH 8/9] fix: image padding --- .../ui/onboarding/CreateWalletWithPassphraseScreen.kt | 8 +------- 1 file changed, 1 insertion(+), 7 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 1dadbe0adc..a64b6e3e5c 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding -import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState @@ -18,8 +17,6 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -34,17 +31,13 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import to.bitkit.R import to.bitkit.ui.components.BodyM import to.bitkit.ui.components.Display @@ -99,6 +92,7 @@ fun CreateWalletWithPassphraseScreen( .imePadding() .verticalScroll(rememberScrollState()) ) { + Spacer(modifier = Modifier.height(MediumAppBarCollapsedHeight)) Image( painter = painterResource(id = R.drawable.padlock2), contentDescription = null, From 074f597858fe2d48acbde32e5cb8e6507f7ea989 Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Tue, 11 Mar 2025 07:02:10 -0300 Subject: [PATCH 9/9] refactor: move HighlightLabel.kt to components package --- .../ui/{shared => components}/HighlightLabel.kt | 11 +---------- .../ui/onboarding/CreateWalletWithPassphraseScreen.kt | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) rename app/src/main/java/to/bitkit/ui/{shared => components}/HighlightLabel.kt (94%) diff --git a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt b/app/src/main/java/to/bitkit/ui/components/HighlightLabel.kt similarity index 94% rename from app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt rename to app/src/main/java/to/bitkit/ui/components/HighlightLabel.kt index 66f3f70411..79a0c99620 100644 --- a/app/src/main/java/to/bitkit/ui/shared/HighlightLabel.kt +++ b/app/src/main/java/to/bitkit/ui/components/HighlightLabel.kt @@ -1,4 +1,4 @@ -package to.bitkit.ui.shared +package to.bitkit.ui.components import androidx.compose.foundation.Canvas @@ -20,7 +20,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import to.bitkit.R -import to.bitkit.ui.components.Caption13Up import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors.Brand @@ -116,14 +115,6 @@ fun FlexibleLogoPreview() { } } -@Preview(showBackground = true) -@Composable -fun ShortTextLogoPreview() { - AppThemeSurface { - HighlightLabel(text = "GAME") - } -} - @Preview(showBackground = true) @Composable fun LongTextLogoPreview() { 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 a64b6e3e5c..e869412b23 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt @@ -41,9 +41,9 @@ import androidx.compose.ui.unit.dp import to.bitkit.R 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.shared.HighlightLabel -import to.bitkit.ui.shared.mainRectHeight +import to.bitkit.ui.components.mainRectHeight import to.bitkit.ui.theme.AppTextFieldDefaults import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors