From 2c0ded8362e5086dcf5265e5b8a5a3e975936cc5 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Sun, 20 May 2018 01:46:20 +0200 Subject: [PATCH] Attempt at resolving the issue reported in #94 --- .../ui/chat/info/user/UserInfoFragment.kt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt index a8e61b0a0..96c1aaa9e 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt @@ -48,7 +48,6 @@ import de.kuschku.quasseldroid.util.irc.format.spans.IrcItalicSpan import de.kuschku.quasseldroid.util.service.ServiceBoundFragment import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod import de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper -import de.kuschku.quasseldroid.util.ui.TextDrawable import de.kuschku.quasseldroid.viewmodel.EditorViewModel.Companion.IGNORED_CHARS import io.reactivex.Observable import javax.inject.Inject @@ -177,18 +176,8 @@ class UserInfoFragment : ServiceBoundFragment() { val senderColorIndex = IrcUserUtils.senderColor(user.nick) val rawInitial = user.nick.trimStart(*IGNORED_CHARS).firstOrNull() ?: user.nick.firstOrNull() - val initial = rawInitial?.toUpperCase().toString() - val senderColor = when (messageSettings.colorizeNicknames) { - MessageSettings.ColorizeNicknamesMode.ALL -> senderColors[senderColorIndex] - MessageSettings.ColorizeNicknamesMode.ALL_BUT_MINE -> - if (user.network?.isMyNick(user.nick) == true) selfColor - else senderColors[senderColorIndex] - MessageSettings.ColorizeNicknamesMode.NONE -> selfColor - } - avatar.loadAvatars( AvatarHelper.avatar(messageSettings, user, maxOf(avatar.width, avatar.height)), - TextDrawable.builder().buildRect(initial, senderColor), crop = false ) -- GitLab