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

Fixes #71

parent 6094fa2c
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -21,6 +21,7 @@ package de.kuschku.quasseldroid.ui.chat.info.user ...@@ -21,6 +21,7 @@ package de.kuschku.quasseldroid.ui.chat.info.user
import android.arch.lifecycle.Observer import android.arch.lifecycle.Observer
import android.os.Bundle import android.os.Bundle
import android.text.SpannableString
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
...@@ -33,6 +34,7 @@ import butterknife.ButterKnife ...@@ -33,6 +34,7 @@ import butterknife.ButterKnife
import de.kuschku.libquassel.protocol.Buffer_Type import de.kuschku.libquassel.protocol.Buffer_Type
import de.kuschku.libquassel.quassel.syncables.IrcUser import de.kuschku.libquassel.quassel.syncables.IrcUser
import de.kuschku.libquassel.util.IrcUserUtils import de.kuschku.libquassel.util.IrcUserUtils
import de.kuschku.libquassel.util.helpers.nullIf
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.ChatActivity import de.kuschku.quasseldroid.ui.chat.ChatActivity
...@@ -40,6 +42,7 @@ import de.kuschku.quasseldroid.ui.chat.input.AutoCompleteHelper.Companion.IGNORE ...@@ -40,6 +42,7 @@ import de.kuschku.quasseldroid.ui.chat.input.AutoCompleteHelper.Companion.IGNORE
import de.kuschku.quasseldroid.util.avatars.AvatarHelper import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.helper.*
import de.kuschku.quasseldroid.util.irc.format.ContentFormatter import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
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
...@@ -156,8 +159,10 @@ class UserInfoFragment : ServiceBoundFragment() { ...@@ -156,8 +159,10 @@ class UserInfoFragment : ServiceBoundFragment() {
realName.text = contentFormatter.formatContent(user.realName()) realName.text = contentFormatter.formatContent(user.realName())
realName.visibleIf(user.realName().isNotBlank() && user.realName() != user.nick()) realName.visibleIf(user.realName().isNotBlank() && user.realName() != user.nick())
awayMessage.text = user.awayMessage() awayMessage.text = user.awayMessage().nullIf { it.isBlank() } ?: SpannableString(getString(R.string.label_no_away_message)).apply {
awayContainer.visibleIf(user.isAway() && user.awayMessage().isNotBlank()) setSpan(IrcItalicSpan(), 0, length, 0)
}
awayContainer.visibleIf(user.isAway())
account.text = user.account() account.text = user.account()
accountContainer.visibleIf(user.account().isNotBlank()) accountContainer.visibleIf(user.account().isNotBlank())
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<string name="label_new_server">Server hinzufügen</string> <string name="label_new_server">Server hinzufügen</string>
<string name="label_nicklist">Benutzerliste</string> <string name="label_nicklist">Benutzerliste</string>
<string name="label_no">Nein</string> <string name="label_no">Nein</string>
<string name="label_no_away_message">Kein Abwesenheitsgrund angegeben</string>
<string name="label_reply">Antworten</string> <string name="label_reply">Antworten</string>
<string name="label_reset">Zurücksetzen</string> <string name="label_reset">Zurücksetzen</string>
<string name="label_open">Öffnen</string> <string name="label_open">Öffnen</string>
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<string name="label_new_server">Naujas Serveris</string> <string name="label_new_server">Naujas Serveris</string>
<string name="label_nicklist">Slapyvardžių Sąrašas</string> <string name="label_nicklist">Slapyvardžių Sąrašas</string>
<string name="label_no">Ne</string> <string name="label_no">Ne</string>
<string name="label_no_away_message">Priežastis nenurodyta</string>
<string name="label_reply">Atsakyti</string> <string name="label_reply">Atsakyti</string>
<string name="label_reset">Atstatyti</string> <string name="label_reset">Atstatyti</string>
<string name="label_open">Atverti</string> <string name="label_open">Atverti</string>
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<string name="label_new_server">New Server</string> <string name="label_new_server">New Server</string>
<string name="label_nicklist">Nick List</string> <string name="label_nicklist">Nick List</string>
<string name="label_no">No</string> <string name="label_no">No</string>
<string name="label_no_away_message">No Away Message Set</string>
  • Shane Synan @digitalcircuit ·
    Reporter

    Purely subjective opinion, this is a little bit confusing.

    The IRC nickname most likely has an away message set (as sending AWAY with no message removes the away message), Quassel just doesn't know what the message is.

    Perhaps No away message known, or some variant?

    EDIT: Moved this to a new issue, #73 (closed) .

    Edited by Shane Synan
  • Please register or sign in to reply
<string name="label_reply">Reply</string> <string name="label_reply">Reply</string>
<string name="label_reset">Reset</string> <string name="label_reset">Reset</string>
<string name="label_open">Open</string> <string name="label_open">Open</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment