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

Improve away state display

parent 15059451
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -51,6 +51,8 @@
style="@style/Widget.RtlConformTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="?attr/colorTextPrimary"
android:textSize="13sp"
tools:text="@sample/messages.json/data/sender" />
......@@ -60,6 +62,8 @@
style="@style/Widget.RtlConformTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="?attr/colorTextSecondary"
android:textSize="12sp"
tools:text="@sample/messages.json/data/sender"
......
......@@ -18,6 +18,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -27,8 +28,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="4dp"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
tools:showIn="@layout/fragment_nick_list">
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<ImageView
android:id="@+id/avatar"
......@@ -41,9 +41,10 @@
tools:src="@tools:sample/avatars" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
<TextView
......@@ -51,6 +52,8 @@
style="@style/Widget.RtlConformTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="?attr/colorTextSecondary"
android:textSize="13sp"
android:textStyle="italic"
......@@ -61,10 +64,22 @@
style="@style/Widget.RtlConformTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="?attr/colorTextSecondary"
android:textSize="12sp"
android:textStyle="italic"
tools:text="@sample/messages.json/data/sender"
tools:visibility="visible" />
</LinearLayout>
<android.support.v7.widget.AppCompatImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/label_user_away"
app:srcCompat="@drawable/ic_clock"
app:tint="?colorTextSecondary" />
</LinearLayout>
......@@ -32,8 +32,6 @@ import de.kuschku.libquassel.session.Backend
import de.kuschku.libquassel.session.ISession
import de.kuschku.libquassel.session.SessionManager
import de.kuschku.libquassel.util.Optional
import de.kuschku.libquassel.util.compatibility.LoggingHandler
import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
import de.kuschku.libquassel.util.flag.and
import de.kuschku.libquassel.util.flag.hasFlag
import de.kuschku.libquassel.util.helpers.*
......@@ -47,10 +45,6 @@ import io.reactivex.subjects.BehaviorSubject
import java.util.concurrent.TimeUnit
class QuasselViewModel : ViewModel() {
init {
log(LoggingHandler.LogLevel.ERROR, "DEBUG", "QuasselViewModel created! ${hashCode()}")
}
val backendWrapper = BehaviorSubject.createDefault(Observable.empty<Optional<Backend>>())
val selectedMessages = BehaviorSubject.createDefault(emptyMap<MsgId, FormattedMessage>())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment