From 9b88b5638d0b36a4dba130a2755093874d099c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Fri, 10 Jan 2025 13:18:35 +0100 Subject: [PATCH] [#1725] Release 1.3.2 (829) * Fix KS confirm QR background * Changelogs version --- CHANGELOG.md | 2 +- docs/whatsNew/WHATS_NEW_EN.md | 2 +- docs/whatsNew/WHATS_NEW_ES.md | 2 +- .../co/electriccoin/zcash/ui/design/component/ZashiQr.kt | 4 ++-- .../zcash/ui/screen/qrcode/view/QrCodeView.kt | 9 ++------- .../zcash/ui/screen/request/view/RequestQrCodeView.kt | 9 ++------- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cad55ba1..1cb60deb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] -## [1.3.2 (828)] - 2025-01-09 +## [1.3.2 (829)] - 2025-01-10 ### Changed - Send Confirmation & Send Progress screens have been refactored diff --git a/docs/whatsNew/WHATS_NEW_EN.md b/docs/whatsNew/WHATS_NEW_EN.md index 650dbcd14..92254bd6e 100644 --- a/docs/whatsNew/WHATS_NEW_EN.md +++ b/docs/whatsNew/WHATS_NEW_EN.md @@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] -## [1.3.2 (828)] - 2025-01-09 +## [1.3.2 (829)] - 2025-01-10 ### Changed - Zashi now displays the dark version of QR codes in the dark theme diff --git a/docs/whatsNew/WHATS_NEW_ES.md b/docs/whatsNew/WHATS_NEW_ES.md index 44a1aabfd..e269683ad 100644 --- a/docs/whatsNew/WHATS_NEW_ES.md +++ b/docs/whatsNew/WHATS_NEW_ES.md @@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] -## [1.3.2 (828)] - 2025-01-09 +## [1.3.2 (829)] - 2025-01-10 ### Cambiado - Zashi ahora muestra la versión oscura de los códigos QR en el tema oscuro. diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt index e058d00c6..fcb3319b1 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt @@ -35,10 +35,10 @@ fun ZashiQr( modifier = modifier, shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl), border = BorderStroke(width = 1.dp, color = ZashiColors.Surfaces.strokePrimary), - color = ZashiColors.Surfaces.bgPrimary orDark ZashiColors.Surfaces.bgAlt + color = ZashiColors.Surfaces.bgPrimary ) { Box( - modifier = Modifier.padding(all = 6.dp) + modifier = Modifier.padding(all = 12.dp) ) { Image( bitmap = bitmap, diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/view/QrCodeView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/view/QrCodeView.kt index 5eb860c9f..ae7290cc4 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/view/QrCodeView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/view/QrCodeView.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -479,12 +478,8 @@ private fun ColumnScope.QrCode( shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) ) .background( - if (isSystemInDarkTheme()) { - ZashiColors.Surfaces.bgPrimary - } else { - ZashiColors.Surfaces.bgPrimary - }, - RoundedCornerShape(ZashiDimensions.Radius.radius4xl) + color = ZashiColors.Surfaces.bgPrimary, + shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) ) .padding(all = 12.dp), qrCodeType = qrCodeType diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestQrCodeView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestQrCodeView.kt index 7b6ce8229..ae414bd2e 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestQrCodeView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestQrCodeView.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -132,12 +131,8 @@ private fun ColumnScope.QrCode( shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) ) .background( - if (isSystemInDarkTheme()) { - ZashiColors.Surfaces.bgPrimary - } else { - ZashiColors.Surfaces.bgPrimary - }, - RoundedCornerShape(ZashiDimensions.Radius.radius4xl) + color = ZashiColors.Surfaces.bgPrimary, + shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) ) .padding(all = 12.dp) )