mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-18 07:11:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-14044: Fix line-breaking logic (#4218)

Browse source
This commit is contained in:
David Perez 2024-11-01 11:21:48 -05:00 committed by GitHub
parent 51e299998f
commit 2eb41e932b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt
View file

@ -21,7 +21,7 @@ import kotlin.math.floor
* This character takes up no space but can be used to ensure a string is not empty. It can also * This character takes up no space but can be used to ensure a string is not empty. It can also
* be used to insert "safe" line-break positions in a string. * be used to insert "safe" line-break positions in a string.
* *
* Note: Is a string only contains this charactor, it is _not_ considered blank. * Note: Is a string only contains this character, it is _not_ considered blank.
*/ */
const val ZERO_WIDTH_CHARACTER: String = "\u200B" const val ZERO_WIDTH_CHARACTER: String = "\u200B"
@ -126,14 +126,15 @@ fun String.withLineBreaksAtWidth(
): String { ): String {
val measurer = rememberTextMeasurer() val measurer = rememberTextMeasurer()
return remember(this, widthPx, monospacedTextStyle) { return remember(this, widthPx, monospacedTextStyle) {
val characterSizePx = measurer if (widthPx > 0 && this.isNotEmpty()) {
.measure("*", monospacedTextStyle) val stringLengthPx = measurer
.measure(text = this, softWrap = false, style = monospacedTextStyle)
.size .size
.width .width
val perLineCharacterLimit = floor(widthPx / characterSizePx).toInt() val linesRequired = stringLengthPx / widthPx
if (widthPx > 0) { val charsPerLine = floor(this.length / linesRequired).toInt()
this this
.chunked(perLineCharacterLimit) .chunked(size = charsPerLine)
.joinToString(separator = "\n") .joinToString(separator = "\n")
} else { } else {
this this