nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10760 from nextcloud/fix/9887 

TextDrawable: handle spaces at start/end of displayNames
This commit is contained in:
Álvaro Brey 2022-09-28 10:50:38 +02:00 committed by GitHub
parent 74916e72ff 43bf5b982a
commit 4bc0e24efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/owncloud/android/ui/TextDrawable.java
View File

@ -23,7 +23,6 @@
package com.owncloud.android.ui;
import android.accounts.Account;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
@ -133,12 +132,12 @@ public class TextDrawable extends Drawable {
}
@VisibleForTesting
public static String extractCharsFromDisplayName(@NonNull String displayName) {
if (displayName.isEmpty()) {
public static String extractCharsFromDisplayName(@NonNull final String displayName) {
final String trimmed = displayName.trim();
if (trimmed.isEmpty()) {
return "";
}
String[] nameParts = displayName.split("\\s+");
String[] nameParts = trimmed.split("\\s+");
StringBuilder firstTwoLetters = new StringBuilder();
for (int i = 0; i < Math.min(2, nameParts.length); i++) {

42
app/src/test/java/com/owncloud/android/ui/TextDrawableTest.kt
View File

@ -23,17 +23,43 @@ package com.owncloud.android.ui
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@RunWith(Parameterized::class)
class TextDrawableTest {
@Parameterized.Parameter(0)
lateinit var expected: String
@Parameterized.Parameter(1)
lateinit var input: String
@Test
fun twoDigitAvatars() {
assertEquals("A", TextDrawable.extractCharsFromDisplayName("Admin"))
assertEquals("TS", TextDrawable.extractCharsFromDisplayName("Test Server Admin"))
assertEquals("", TextDrawable.extractCharsFromDisplayName(""))
assertEquals("CP", TextDrawable.extractCharsFromDisplayName("Cormier Paulette"))
assertEquals("WB", TextDrawable.extractCharsFromDisplayName("winston brent"))
assertEquals("BJ", TextDrawable.extractCharsFromDisplayName("Baker James Lorena"))
assertEquals("BJ", TextDrawable.extractCharsFromDisplayName("Baker James Lorena"))
assertEquals("E", TextDrawable.extractCharsFromDisplayName("email@nextcloud.localhost"))
assertEquals(
"Avatar chars from displayname not correct",
expected,
TextDrawable.extractCharsFromDisplayName(input)
)
}
companion object {
@Parameterized.Parameters(name = "{1}")
@JvmStatic
fun data(): Iterable<Array<String>> = listOf(
arrayOf("A", "Admin"),
arrayOf("TS", "Test Server Admin"),
arrayOf("", ""),
arrayOf("CP", "Cormier Paulette"),
arrayOf("WB", "winston brent"),
arrayOf("BJ", "Baker James Lorena"),
arrayOf("BJ", "Baker James Lorena"),
arrayOf("E", "email@nextcloud.localhost"),
arrayOf("SA", " Spaces At Start"),
arrayOf("SA", "Spaces At End "),
arrayOf("SA", " Spaces At Start And End "),
arrayOf("", " ")
)
}
}