Skip to content
Snippets Groups Projects
Verified Commit 2c0ded83 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Attempt at resolving the issue reported in #94

parent c93b5686
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -48,7 +48,6 @@ import de.kuschku.quasseldroid.util.irc.format.spans.IrcItalicSpan ...@@ -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.service.ServiceBoundFragment
import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod
import de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper import de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper
import de.kuschku.quasseldroid.util.ui.TextDrawable
import de.kuschku.quasseldroid.viewmodel.EditorViewModel.Companion.IGNORED_CHARS import de.kuschku.quasseldroid.viewmodel.EditorViewModel.Companion.IGNORED_CHARS
import io.reactivex.Observable import io.reactivex.Observable
import javax.inject.Inject import javax.inject.Inject
...@@ -177,18 +176,8 @@ class UserInfoFragment : ServiceBoundFragment() { ...@@ -177,18 +176,8 @@ class UserInfoFragment : ServiceBoundFragment() {
val senderColorIndex = IrcUserUtils.senderColor(user.nick) val senderColorIndex = IrcUserUtils.senderColor(user.nick)
val rawInitial = user.nick.trimStart(*IGNORED_CHARS).firstOrNull() val rawInitial = user.nick.trimStart(*IGNORED_CHARS).firstOrNull()
?: user.nick.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( avatar.loadAvatars(
AvatarHelper.avatar(messageSettings, user, maxOf(avatar.width, avatar.height)), AvatarHelper.avatar(messageSettings, user, maxOf(avatar.width, avatar.height)),
TextDrawable.builder().buildRect(initial, senderColor),
crop = false crop = false
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment