[#1725] Release 1.3.2 (829)

* Fix KS confirm QR background

* Changelogs version
This commit is contained in:
Honza Rychnovský 2025-01-10 13:18:35 +01:00 committed by GitHub
parent 3f02a5648f
commit 9b88b5638d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 19 deletions

View File

@ -6,7 +6,7 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2
## [Unreleased] ## [Unreleased]
## [1.3.2 (828)] - 2025-01-09 ## [1.3.2 (829)] - 2025-01-10
### Changed ### Changed
- Send Confirmation & Send Progress screens have been refactored - Send Confirmation & Send Progress screens have been refactored

View File

@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.*
## [Unreleased] ## [Unreleased]
## [1.3.2 (828)] - 2025-01-09 ## [1.3.2 (829)] - 2025-01-10
### Changed ### Changed
- Zashi now displays the dark version of QR codes in the dark theme - Zashi now displays the dark version of QR codes in the dark theme

View File

@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.*
## [Unreleased] ## [Unreleased]
## [1.3.2 (828)] - 2025-01-09 ## [1.3.2 (829)] - 2025-01-10
### Cambiado ### Cambiado
- Zashi ahora muestra la versión oscura de los códigos QR en el tema oscuro. - Zashi ahora muestra la versión oscura de los códigos QR en el tema oscuro.

View File

@ -35,10 +35,10 @@ fun ZashiQr(
modifier = modifier, modifier = modifier,
shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl), shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl),
border = BorderStroke(width = 1.dp, color = ZashiColors.Surfaces.strokePrimary), border = BorderStroke(width = 1.dp, color = ZashiColors.Surfaces.strokePrimary),
color = ZashiColors.Surfaces.bgPrimary orDark ZashiColors.Surfaces.bgAlt color = ZashiColors.Surfaces.bgPrimary
) { ) {
Box( Box(
modifier = Modifier.padding(all = 6.dp) modifier = Modifier.padding(all = 12.dp)
) { ) {
Image( Image(
bitmap = bitmap, bitmap = bitmap,

View File

@ -11,7 +11,6 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
@ -479,12 +478,8 @@ private fun ColumnScope.QrCode(
shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
) )
.background( .background(
if (isSystemInDarkTheme()) { color = ZashiColors.Surfaces.bgPrimary,
ZashiColors.Surfaces.bgPrimary shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
} else {
ZashiColors.Surfaces.bgPrimary
},
RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
) )
.padding(all = 12.dp), .padding(all = 12.dp),
qrCodeType = qrCodeType qrCodeType = qrCodeType

View File

@ -6,7 +6,6 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
@ -132,12 +131,8 @@ private fun ColumnScope.QrCode(
shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl) shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
) )
.background( .background(
if (isSystemInDarkTheme()) { color = ZashiColors.Surfaces.bgPrimary,
ZashiColors.Surfaces.bgPrimary shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
} else {
ZashiColors.Surfaces.bgPrimary
},
RoundedCornerShape(ZashiDimensions.Radius.radius4xl)
) )
.padding(all = 12.dp) .padding(all = 12.dp)
) )